Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 18 Aug 2010 06:23:18 +0000 (06:23 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 18 Aug 2010 06:23:18 +0000 (06:23 +0000)

Trivial merge